From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Sat, 12 Mar 2005 21:33:06 +0000 (+0000)
Subject: bitkeeper revision 1.1236.25.11 (42336012SennigZlIjzUQ-DGht1vaw)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~26^2~10
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1579f6425e5f3fefb142091b7016f3ad06c00cb9;p=xen.git

bitkeeper revision 1.1236.25.11 (42336012SennigZlIjzUQ-DGht1vaw)

Update to Linux 2.6.11.
Signed-off-by: Christian Limpach <chris@xensource.com>
---

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
index 2cd0df6262..2d1a431dcd 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11-xen0
-# Fri Mar 11 01:02:42 2005
+# Sat Mar 12 21:28:56 2005
 #
 CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
@@ -13,10 +13,12 @@ CONFIG_NO_IDLE_HZ=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
 CONFIG_XEN_NETDEV_BACKEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_BLKDEV_TAP is not set
 CONFIG_XEN_WRITABLE_PAGETABLES=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_X86=y
@@ -814,7 +816,7 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 # CONFIG_AGP_EFFICEON is not set
-CONFIG_DRM=m
+CONFIG_DRM=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
 CONFIG_DRM_R128=m